Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 21 Feb 2007 14:44:09 +0000 (14:44 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 21 Feb 2007 14:44:09 +0000 (14:44 +0000)

Trivial merge